# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.930.1.194+1.930.107.6 -> 1.930.1.195
# arch/ia64/kernel/setup.c 1.9.1.1 -> 1.12
# include/asm-ia64/processor.h 1.12.1.2 -> 1.17
# arch/ia64/mm/init.c 1.7.2.1 -> 1.13
#
diff -Nru a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c Wed Oct 8 09:08:55 2003
+++ b/arch/ia64/kernel/setup.c Wed Oct 8 09:08:55 2003
@@ -127,7 +127,7 @@
#if IGNORE_PFN0
if (start == PAGE_OFFSET) {
- printk("warning: skipping physical page 0\n");
+ printk(KERN_WARNING "warning: skipping physical page 0\n");
start += PAGE_SIZE;
if (start >= end) return 0;
}
@@ -280,7 +280,7 @@
initrd_start = (unsigned long)__va(ia64_boot_param->initrd_start);
initrd_end = initrd_start+ia64_boot_param->initrd_size;
- printk("Initial ramdisk at: 0x%lx (%lu bytes)\n",
+ printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n",
initrd_start, ia64_boot_param->initrd_size);
}
#endif
@@ -337,8 +337,9 @@
ia64_set_kr(IA64_KR_IO_BASE, phys_iobase);
else {
phys_iobase = ia64_get_kr(IA64_KR_IO_BASE);
- printk("No I/O port range found in EFI memory map, falling back to AR.KR0\n");
- printk("I/O port base = 0x%lx\n", phys_iobase);
+ printk(KERN_INFO "No I/O port range found in EFI memory map, falling back "
+ "to AR.KR0\n");
+ printk(KERN_INFO "I/O port base = 0x%lx\n", phys_iobase);
}
ia64_iobase = (unsigned long) ioremap(phys_iobase, 0);
@@ -472,10 +473,10 @@
}
struct seq_operations cpuinfo_op = {
- start: c_start,
- next: c_next,
- stop: c_stop,
- show: show_cpuinfo
+ .start =c_start,
+ .next = c_next,
+ .stop = c_stop,
+ .show = show_cpuinfo
};
void
@@ -528,7 +529,7 @@
impl_va_msb = vm2.pal_vm_info_2_s.impl_va_msb;
phys_addr_size = vm1.pal_vm_info_1_s.phys_add_size;
}
- printk("CPU %d: %lu virtual and %lu physical address bits\n",
+ printk(KERN_INFO "CPU %d: %lu virtual and %lu physical address bits\n",
smp_processor_id(), impl_va_msb + 1, phys_addr_size);
c->unimpl_va_mask = ~((7L<<61) | ((1L << (impl_va_msb + 1)) - 1));
c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1));
@@ -659,7 +660,7 @@
if (ia64_pal_vm_summary(NULL, &vmi) == 0)
max_ctx = (1U << (vmi.pal_vm_info_2_s.rid_size - 3)) - 1;
else {
- printk("cpu_init: PAL VM summary failed, assuming 18 RID bits\n");
+ printk(KERN_WARNING "cpu_init: PAL VM summary failed, assuming 18 RID bits\n");
max_ctx = (1U << 15) - 1; /* use architected minimum */
}
while (max_ctx < ia64_ctx.max_ctx) {
@@ -669,7 +670,7 @@
}
if (ia64_pal_rse_info(&num_phys_stacked, 0) != 0) {
- printk ("cpu_init: PAL RSE info failed, assuming 96 physical stacked regs\n");
+ printk(KERN_WARNING "cpu_init: PAL RSE info failed, assuming 96 physical stacked regs\n");
num_phys_stacked = 96;
}
local_cpu_data->phys_stacked_size_p8 = num_phys_stacked*8 + 8;
diff -Nru a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
--- a/arch/ia64/mm/init.c Wed Oct 8 09:08:55 2003
+++ b/arch/ia64/mm/init.c Wed Oct 8 09:08:55 2003
@@ -252,7 +252,7 @@
pte_t *pte;
if (!PageReserved(page))
- printk("put_gate_page: gate page at 0x%p not in reserved memory\n",
+ printk(KERN_ERR "put_gate_page: gate page at 0x%p not in reserved memory\n",
page_address(page));
pgd = pgd_offset_k(address); /* note: this is NOT pgd_offset()! */
@@ -557,7 +557,7 @@
efi_memmap_walk(create_mem_map_page_table, 0);
free_area_init_node(0, NULL, vmem_map, zones_size, 0, zholes_size);
- printk("Virtual mem_map starts at 0x%p\n", mem_map);
+ printk(KERN_INFO "Virtual mem_map starts at 0x%p\n", mem_map);
}
#endif
}
diff -Nru a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
--- a/include/asm-ia64/processor.h Wed Oct 8 09:08:55 2003
+++ b/include/asm-ia64/processor.h Wed Oct 8 09:08:55 2003
@@ -157,6 +157,7 @@
__u8 family;
__u8 archrev;
char vendor[16];
+ __u8 need_tlb_flush;
__u64 itc_freq; /* frequency of ITC counter */
__u64 proc_freq; /* frequency of processor */
__u64 cyc_per_usec; /* itc_freq/1000000 */
@@ -306,7 +307,7 @@
#define start_thread(regs,new_ip,new_sp) do { \
set_fs(USER_DS); \
- regs->cr_ipsr = ((regs->cr_ipsr | (IA64_PSR_BITS_TO_SET | IA64_PSR_CPL | IA64_PSR_SP)) \
+ regs->cr_ipsr = ((regs->cr_ipsr | (IA64_PSR_BITS_TO_SET | IA64_PSR_CPL)) \
& ~(IA64_PSR_BITS_TO_CLEAR | IA64_PSR_RI | IA64_PSR_IS)); \
regs->cr_iip = new_ip; \
regs->ar_rsc = 0xf; /* eager mode, privilege level 3 */ \
@@ -395,7 +396,7 @@
static inline unsigned long
ia64_get_kr (unsigned long regnum)
{
- unsigned long r;
+ unsigned long r = 0;
switch (regnum) {
case 0: asm volatile ("mov %0=ar.k0" : "=r"(r)); break;